[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: 8e73ee68 am: 9689acf3 am: 6e94d2c9 -s ours

am skip reason: subject contains skip directive

Change-Id: I084563daf769042b332fbe0d39486d4fbf06ebd6