Merge "Rename profileSystemServer to shouldProfileSystemServer" am: f7335ffb9a
am: 2b3e8ad368

Change-Id: I067e44ed65cda267edc60f3bf3845cb80d9b3434