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