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