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