Merge changes from topic "erroneous_data_reporting_log_and_return" am:...

Merge changes from topic "erroneous_data_reporting_log_and_return" am: ce04c6b1 am: 8b968164 am: 952201bd

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



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