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