[automerger skipped] Merge "Merge two ObexAppParameters classes" into...

[automerger skipped] Merge "Merge two ObexAppParameters classes" into tm-qpr-dev am: caca769d -s ours

am skip reason: Merged-In Ib89e4485758d9f5b3f780a1b7a867c9086b3e176 with SHA-1 2a198d4a is already in history

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



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