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