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