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