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