[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 skip reason: subject contains skip directive

Change-Id: I72cc5528c0be197d7c2b9474a81996a14fdcf789