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