[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 28f2e1dfc2 -s ours am: eff24fc89f

Change-Id: I3e8aadf8a4e1705889dfbf9e6c3ce293e1dea838