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

Change-Id: Ice16f855095aed362a04a33cca03a9a24b65a233