Merge "Merge "Wait for idmap service on current thread" into rvc-dev am: 6831d480 am: 5629f090" into rvc-d1-dev-plus-aosp