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