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