Merge "Fix waiting for system server to be running for BootImageProfileTest"
am: 761ce2abac

Change-Id: I597247d864e5b92d734405c87b59ef3282f80cb9