Merge "Dismiss Play Protect dialog faster for PackageManagerServiceTests" into udc-dev am: 55c12ea5 am: c345ef85

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



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