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