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