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