[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oreo-cts-dev am: 9cc6a83ee8 -s ours am: 4a4f79da64 am: ba7321bc23

Original change: https://android-review.googlesource.com/c/platform/cts/+/1323682

Change-Id: Ib1cfd870a0b5df5d49a477b93f101d86c6e13f0e