[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into qt-dev am: a61cad1c am: 227bb22b -s ours am: 2614ce91 am: 026631ce am: b1b31c37 am: b892144f am: 42331307 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib065a2f222f0e118fb7c0968e37eb7b571cf7281