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