Merge "Don't return from inside log tag enforced blocks" into main am: 65da211f

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



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