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

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

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



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