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