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