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

Change-Id: I42d155e31a5bc5a5a2a918c62768c5823f242bf2