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

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



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