Merge "CEC: Implement getSupportedShortAudioDescriptor method." am: b65741930f am: b1f73213b6 am: c8beeff74c am: b5f26196ae am: d39c9c166b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081683

Change-Id: I6d59bff774c963aac019d74386dd28dd64484091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>