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