Merge "fix app binder tracing on userdebug builds" into rvc-dev