[automerger skipped] Merge "Fix Null Pointer Exception" into tm-qpr-dev am:...

[automerger skipped] Merge "Fix Null Pointer Exception" into tm-qpr-dev am: ca7e278e am: 5e001a82 -s ours

am skip reason: Merged-In Idda86e857108db4cc847e3e2cd0a40ba0ce6ee36 with SHA-1 a9dac4fb is already in history

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



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