[automerger skipped] Merge "Use a non-null package name when creating a...

[automerger skipped] Merge "Use a non-null package name when creating a ComponentName" am: d1bfe2ec am: d89a3614 -s ours

am skip reason: Merged-In Icedf4c11efd242d925c0c8d993d9706882df54c2 with SHA-1 8ff3a7d3 is already in history

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



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