Merge "Fix can't turn off Google" into udc-dev am: d5b4b9b9 am: 44dfec11

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



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