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

Change-Id: I0d54112c689aeaf83c4bc108af0a303e2850e85a