Merge "[automerger skipped] Merge "Add process-lifecycle-owner-initializer to tests." am: 460a529471  -s ours" into stage-aosp-master am: 7e02c288f0  -s ours
am: c1d7b68f61  -s ours

Change-Id: I0d192e627f4d07dd9fb7bd411a1a0afdc31b4d39