Merge "Merge "Wait for idmap service on current thread" into rvc-dev am:...

Merge "Merge "Wait for idmap service on current thread" into rvc-dev am: 6831d480 am: 5cb51599 am: 7f9698f0" into mainline-prod am: 88a49d1e am: bcc6a18d

Change-Id: If3dba583c1c6690f7d2912c911af2eb93b0e341c