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