Merge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62
am: 47f2cf5144

Change-Id: I5d9f5cd7942547d4b9c11a5b3cc56799c92cd62a