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