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

Change-Id: I2e755679bfea1cdb86a645948b32820c2d8dbf50