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