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