[automerger skipped] Merge "Revert "Fix an OOB write bug in...

[automerger skipped] Merge "Revert "Fix an OOB write bug in attp_build_value_cmd"" into tm-dev am: 24ed2f4e am: b549dd54 am: b45abcf0 am: 140d750d am: 6626cd69 am: ce90c702 -s ours

am skip reason: Merged-In Ie16251c3a2b7c0f807ecb53bbf125d1e8c276e48 with SHA-1 b927f3fb is already in history. Merged-In was found from reverted change.

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

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



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