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