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