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

am skip reason: subject contains skip directive

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

Change-Id: I8a1cd4d3342cf60bb1cf9f334d55238a7cae76d1