Merge "Stop lock on GMSCore crashloop" into udc-dev am: 49faea59 am: 34ff9407 am: 82bb64de am: 664279d0

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



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