Merge "Revert^2 "libbinder: introduce guards for getCalling*"" am: 732cdb359f am: d595051f2e

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

Change-Id: I84206048940b08d9054f0f4b8a2d2010c29da9c2