Merge "RESTRICT AUTOMERGE: O Backport: Add a regression test for bug 118835133" into oreo-cts-dev