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

Change-Id: I163a9815f5001bbd5963dd0575b9fd2125169b38