Merge "Merge "Send transaction callbacks even when no BSL" into tm-dev am: f18ac6cac6 am: c7ebf7c488" into tm-d1-dev-plus-aosp am: 67037c8f3f

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

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