Merge "Make caller wait for installd to become available." into tm-dev am:...

Merge "Make caller wait for installd to become available." into tm-dev am: 98040763 am: c5688f4a am: 4b9d0558

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284939



Change-Id: Id4103310aa5273f67873abff7a5228509f029011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>