Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev am: 07df171ac6 am: c4b627b7d7
am: 83c2bd5ddd

Change-Id: Ie226534011d6439c24cfe1957c5cf47ba171b0c0