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