[conflict] Merge "Standardize TAG constants to use `FOO.class.getSimpleName()`...

[conflict] Merge "Standardize TAG constants to use `FOO.class.getSimpleName()` as opposed to a string" into main am: c12790b7 am: 63ca4b58

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



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