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

Change-Id: Ieb5763c2a1dcf7972a4cb190a50da891c1249c43