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

am skip reason: subject contains skip directive

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

Change-Id: I7154777a4b76057895b606d4bb0cb9909b918086