Merge "profcollect: Fix NPE when invoking UsbManager" into main am: a3027e70b1 am: a68bbaff43

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

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