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