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