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