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

Change-Id: I15fd84d2456eebe8d49cc6c0cf8739ebdd82f7d1