[automerger skipped] Merge "Read APCF extended features" into stage-aosp-master am: 696be06a -s ours am: e0a5cce7 -s ours

am skip reason: Merged-In Id956c8e0d37fad934033dc462f393b050d19d9fb with SHA-1 52a366a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20170572



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