[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

Change-Id: Idcb6d1087a3b1fed7432e3ddd008505a541e66b8