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:3c5f557d32329d50af6642079c8cce32bb5fb3af)
Merged-In: I78a249561fd8ccab38e32fe2e14d90e3b4420dcb
Change-Id: I78a249561fd8ccab38e32fe2e14d90e3b4420dcb