Merge changes from topic "am-332d7bf958664efb81840981a12b2a8d" into rvc-d1-dev-plus-aosp

* changes:
  [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
  [automerger skipped] RESTRICT AUTOMERGE am: 98f45443 am: 68a439a7 am: 48935269 -s ours am: 3a6798fb -s ours am: 1f6be626 am: 90a5161b -s ours am: d56c04ba am: 2c99d505