Merge "Enable the generate transaction name for system server." am: 3e3a6e47 am: c142f686 am: 5f048809 am: 51545027 Change-Id: I3e41fcc399e609aec59f4299a1f0231f5f376df2