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