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