[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 28f2e1df -s ours am: eff24fc8 am: a3574db3 -s ours am: 3e8ecfad am: c320cfd3 am: 888d97e9 am: b6d57957 am: 02554bd7 -s ours

am skip reason: subject contains skip directive

Change-Id: I92a0b7a66c7395b3a65bd3f01b76e0a49dba2758