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