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