Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707



Change-Id: Ib816f76a9cdea03f6180dea856da3516eac72cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>