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: 5629f090" into rvc-d1-dev-plus-aosp am: 6e3302ad am: 68072027

Change-Id: Iade8c8ced08d6634bc2f9180766d65d2afc93c54