[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 skip reason: subject contains skip directive

Change-Id: Ice8e53ec4708100dcb336e53797dfd7169c37fd8