[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: 862f3ac789

Change-Id: I9299a580b60b0ae26bd87fd6820ab1a6a783eaba