Merge changes from topic "binder-tls-trigger" am: 53195f9d63 am: dd326395b5

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

Change-Id: Ide41d884303348307aafcb3cf3891c80d8c8c2a5