Merge changes from topic...

Merge changes from topic "revert-2524698-erroneous_data_reporting_reland-QSIRBXWPPK" am: b86f92b2 am: 0b4fde53 am: a47fb143

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



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