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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:39a69ddf3bde00b572bd75f9b27e4acc736a2740)
Merged-In: I877223e4a7141c73bc28ae2133fd26f4bd736321
Change-Id: I877223e4a7141c73bc28ae2133fd26f4bd736321