Merge "Revert "Add flag to handle multiple encryption request"" into main am:...

Merge "Revert "Add flag to handle multiple encryption request"" into main am: 0b4d8a78 am: 26c4816c

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



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