Merge "Rename profileSystemServer to shouldProfileSystemServer"
am: f7335ffb9a

Change-Id: I56fb79a947c2dc2a0c53c87472cd101674d889d9