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