[automerger skipped] SDP: Add feature flag for serialization am: 40fab4b6 -s...

[automerger skipped] SDP: Add feature flag for serialization am: 40fab4b6 -s ours am: d6f9fa57 -s ours

am skip reason: Merged-In Ib1ab0749e0fcb194e956b2bddce7e3b0cfd6c081 with SHA-1 a129f011 is already in history

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



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