Merge "Stop lock on GMSCore crashloop" into udc-dev am: 49faea59 am: e458cdfe am: 2f403439 am: 0629c814

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



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