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