[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 2ffbce4e am: ee56d716 am: d6d7f518 -s ours am: 55fa3101 -s ours am: 7eb69864 am: 295b8778 -s ours am: a971ec41 am: 8e73ee68 am: 9689acf3

Change-Id: I531e6197915cfa425d798f6d508724ab2b753c32