tree 56f6c61d487a56cfa77e6359fc4c20318c36fb18
parent 8e1acd2d33039ecf14c82ec0eba585aafbd10457
parent ba7321bc235873f39284dff1ae0648fe49b8dd6b
author Treehugger Robot <treehugger-gerrit@google.com> 1591236859 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591236859 +0000

[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