[automerger skipped] Merge "Pipe disabled compat changes to runtime through zygote." am: f33c3a8c9d am: c06f69d2b4 am: b988967879 -s ours
am skip reason: Change-Id I6645a7ec767400cd579207f0eed1e6e7136c8a6f with SHA-1 5ae996f892 is in history

Change-Id: I51e9cb46484216907551b884dc7a90b93b0e0c54