Merge "Add future consideration for USB rndis notification handling"
am: 4263a5ed58

Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6