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