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