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: Ic7f091fe2f612edf3f6b3f0bad8f46b35158f849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>