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

Change-Id: Ic035a681ea95fc903109163b0a7e189b0887849c