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