tree cd882c5803f7338ffdf66611f090b684a3d74eb6
parent c95ca17d04f620bc3f8419eeb3516730945fabc4
parent ca31663ab4fd7da6cb5102add2c93e591cc35119
author Mathieu Chartier <mathieuc@google.com> 1571930215 -0700
committer android-build-merger <android-build-merger@google.com> 1571930215 -0700

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

Change-Id: Idd2b43b3996273df7c83d661734c0e210747c07a