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