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

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

Change-Id: I23092e44fe1b05bf444c52ae285aaf3fe744525c