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

Change-Id: I317b694c3a8c76077c031c4410d5b97ed79c1bbc