Merge "Add short audio descriptor and encapsulation type in AudioProfile." am: 6ba267ef8d am: 30c8e986e9 am: 203d55425f

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1650820

Change-Id: I175ef9ccfb3de0c828ebf534d0f18c7d0f2b5799