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