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

Change-Id: If6fcfe7bb0afa2852de98a684c4d96a0c901849b