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

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



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