Merge changes from topic "binder_tls" am: ab281ec6f1

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

Change-Id: I0912ce1bd2652894a310678f1abe71403fd8f2fc