RESTRICT AUTOMERGE
Prevent accessing companion records from arbitrary uids

Relanding after previous revert.

Test: manual
Bug: 129476618
Change-Id: Ia906d2e16fa8b00eda0a00e622cc21e29fb90481
(cherry picked from commit 8643636095dc9b3c70a62ef16f68df12dff67fe7)
(cherry picked from commit acd10b237c5b5652bfb657c051f15eeed2931b2f)
1 file changed