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