Merge changes from topic "fix-b-255477173-aptx-formats" am: 4872186e am: 526354de

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



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