Merge "Add com.android.future.usb.accessory api files" am: 6f5cc30299 am: 8cfa7e84b4
am: bcba8806ea

Change-Id: I90885016b58e40c142e74a3fdfe9edad519e8a06