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