[automerger skipped] Merge "[LE boradcast] save the data into ContentProvider" into tm-qpr-dev am: 86125487 am: 2ef9f046 -s ours

am skip reason: Merged-In I5f8367f3eb8e2dafa2986004dd8540de41409192 with SHA-1 45af3be3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19834071



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