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