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