[automerger skipped] Merge "Add a Bluetooth UserNull to serve a placeholder"...

[automerger skipped] Merge "Add a Bluetooth UserNull to serve a placeholder" am: 0bfe843b am: f1d1f79c am: 3ab55e9a am: dd2a2fd0 -s ours

am skip reason: Merged-In I9272170838a79df8f0bdaed7d3e6cc7786fed595 with SHA-1 abca1e6f is already in history

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

Change-Id: Iea4d64bc5993d8ccb25d0d8c2f36411baa1fb5aa