Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158
am: ff14dd1274  -s ours

Change-Id: Id2afbac975f5fb5d232fbf57226f575c386379ec