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