Merge "Make system server profiling an explicit runtime intent"
am: 232011c7d9

Change-Id: I07e6b4f0e75ff96bda3d5ce5acf6b9ea1f999325