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