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