Merge changes from topic "erroneous_data_reporting_reland" am: 1957c7ca am: 0a2fac89 am: 2c15ad62 am: 80dabf60 am: cdc23d3a

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



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