[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: 5b65cc70 am: 7461b487 -s ours

am skip reason: subject contains skip directive

Change-Id: I7c7d3c123fa0f5d4e891769c49464d383656327d