Commit 6e3302ad authored Apr 06, 2020 by Automerger Merge Worker Committed by Android (Google) Code Review Apr 06, 2020

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

There are no changes