Merge "Stop lock on GMSCore crashloop" into udc-dev am: 49faea59 am: e458cdfe am: 088a9acd am: 252116c9

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



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