Merge "fix app binder tracing on userdebug builds" into rvc-dev am: 52d70eaa12 am: 1e5593a59e

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

Change-Id: I807c9539b73925534e13fbc82139b9ae79871dbe