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