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

Change-Id: Ib4f930c18eb434b698600dbdafc36daee79d98fc