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

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



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