[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pie-cts-dev am: 6fcd5c5b5a -s ours

am skip reason: subject contains skip directive

Change-Id: Ie96415e27af827cb5b62000036d04f5c172f1c1e