[automerger skipped] Merge "Add missing mandatory =1 plural" am: 76145464...

[automerger skipped] Merge "Add missing mandatory =1 plural" am: 76145464 am: 8d91ec38 -s ours am: 7f1ee2b2 -s ours am: 09672d95 -s ours

am skip reason: Merged-In Iee759acc34d015b527468d8d45a3d27ff4957552 with SHA-1 18032628 is already in history

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



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