Merge "Enable the generate transaction name for system server." am: 3e3a6e4760 am: c142f686c5 am: 5f04880926
am: 515450272d

Change-Id: I3e41fcc399e609aec59f4299a1f0231f5f376df2