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