Merge "Fix can't turn off Google" into udc-dev am: d5b4b9b9 am: 42b7a289...

Merge "Fix can't turn off Google" into udc-dev am: d5b4b9b9 am: 42b7a289 am: b2cafbb1 am: 22f24b28

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



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