Merge "CTS: Annotate UsbDebuggingTest with RestrictedBuildTest." am: 9cb42b73b9 am: d7cc683bf5
am: 2f9583be6f

Change-Id: I5b4a12745726944f1802b133574be42721e5cc38