Merge "Revoke zygote's read permission on keychain data" into lmp-mr1-dev