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