Merge "Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed am: 6ff07301 am: ff14dd12 -s ours" into oc-dr1-dev-plus-aosp