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

Change-Id: Idd2b43b3996273df7c83d661734c0e210747c07a