Merge "Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158 am: ff14dd1274  -s ours" into oc-dr1-dev-plus-aosp