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

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



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