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