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