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