[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 9deb286ecb am: a6779dc9b7 am: 514ed7e61f -s ours am: 455ed2f366 -s ours

am skip reason: subject contains skip directive

Change-Id: Id9a16b3ad0f161949a8b3380ec76174b982d3a8a