Merge "Cleanup bt MetricsLogger" into tm-dev am: dff0613e am: 2fdbd093

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



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