Merge "Merge "Send transaction callbacks even when no BSL" into tm-dev am:...

Merge "Merge "Send transaction callbacks even when no BSL" into tm-dev am: f18ac6ca am: c7ebf7c4" into tm-d1-dev-plus-aosp am: 67037c8f am: e8e78784

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



Change-Id: I0971b41a21461c9fcc86d136a40147575e8d7cd1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>