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