Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
am: d5f442d65b

Change-Id: I00374ea814200a8142e208f9fa2f7b7e2a45f4b0