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