[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 am: c320cfd3f1
Change-Id: I6a5d16c376fc268d7182e78dd47caed0c7d6397e
This commit is contained in: