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