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

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



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