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: 3b329702 am: 9eafd854

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



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