Merge "Merge "Keep USB disconnected receiver active when ADB activity in bg"...

Merge "Merge "Keep USB disconnected receiver active when ADB activity in bg" into rvc-d1-dev am: 9e5913cf am: 909d7c6c" into rvc-qpr-dev-plus-aosp am: 25c70732

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12215433

Change-Id: I3eb940ea16a321d25880baf397134a3eeb74dbbf