Merge "Enable profiling for system server for userdebug|eng" into oc-dev am: 4567c1a1a3
am: 56c80e9adb

Change-Id: I713c70bbfa0c85e6a86fb8b51826348657bf0c90