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