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

Change-Id: Ie6a2c925545a2b9d52c36ab5122c7098bb076f5b