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

am skip reason: subject contains skip directive

Change-Id: I6522ceac8a218bc4ec6598e6bd495ac5019d250f