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