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