Merge changes from topic "binder_tls" am: ab281ec6f1 am: 8af9115cc3

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

Change-Id: I82962879f9fab4469c3fbbaf4fa64f74be7365d3