Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154 Change-Id: I3ce015dfd694e6c7cbdb247a2026e845ea3eb717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>