Merge "Fix default usb settings will set wrong function when onPause()" into...

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

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



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