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