[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into qt-dev am: a61cad1c37 am: 227bb22b0b -s ours

am skip reason: subject contains skip directive

Change-Id: I85993ae8e0b6659401413eb48f9416735b3cb7bf