[automerger skipped] Merge "Enable MAP logging based on logcat value for tag"...

[automerger skipped] Merge "Enable MAP logging based on logcat value for tag" am: d6267500 -s ours am: 7bc8c62d -s ours am: 6e971425 -s ours

am skip reason: Merged-In I2ce8f54b49850b1fa021ddfe06d160f9320a8271 with SHA-1 f56043d2 is already in history

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



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