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