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