Merge "Fix waiting for system server to be running for BootImageProfileTest"