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

am skip reason: subject contains skip directive

Change-Id: I75ead2f7d63cb7262b91bca25a3d52071bb925e8