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