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: a3fee757 am: 372dc93a

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



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