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

Change-Id: Ief07574e6e19538c6bdedc090b00c6da3b260f21