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

Change-Id: I5958635d612a2c23e8d96e38e75eff2f29ff5e28