Merge "Merge "Remove stack trace from Binder#getCallingUidOrWtf" am:...

Merge "Merge "Remove stack trace from Binder#getCallingUidOrWtf" am: 6d040060 am: 680c176d" into tm-qpr-dev-plus-aosp am: 89cfae6c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2380512



Change-Id: I099f13f5b7e944c73a503c45ed2882b6b0c0aa63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>