Merge "RESTRICT AUTOMERGE" into oc-dev am: 46df252ca9 am: bfbdd27187

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

Change-Id: I94178f5bc16a9cb23cb718fce6f9379a771ad99f