[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 28f2e1dfc2 -s ours am: eff24fc89f am: a3574db389 -s ours am: 3e8ecfad42
Change-Id: I4870fcc0a726cff350326aab5bd79e530c2e8e83
This commit is contained in: