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