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