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