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