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