[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 2ffbce4ef6 am: ee56d71633 am: d6d7f518cc -s ours am: 55fa3101de -s ours

am skip reason: subject contains skip directive

Change-Id: I4fabdde2e1250cc8162b9e1e78bb98a58c935383