[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: 99767d89 am: 7d9dba4f am: 809f31c5

Change-Id: I3846a7ebb23a797acb6c99404f464212a331916a