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