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

Change-Id: Ieb6865d5b3a1a0d2a4e84a3532ece2273db003be