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