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