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