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

Change-Id: I8f7d2ea2e24da132edf19fe559f8ecb501b95030