Backport regression fixes for 288144143

These are backports for the following AOSP changes:
aosp/3424923
aosp/3420039
aosp/3394039

which address regressions in the initial fix for above bug.

Bug: 288144143
Test: m libbluetooth
Ignore-AOSP-First: security
Tag: #security
Merged-In: Ibcf0055242970f5354c6127ce908171f89b2b88e
Merged-In: I877223e4a7141c73bc28ae2133fd26f4bd736321
Merged-In: I78a249561fd8ccab38e32fe2e14d90e3b4420dcb
Change-Id: I78a249561fd8ccab38e32fe2e14d90e3b4420dcb