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

Change-Id: If3e659d1f5a4f90aa9ad45c7636a43d39209dcc7