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

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



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