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

Change-Id: Ic53aa21d1f208e45c0018053c1e06ed51eafad8d