Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: O Backport: Add a regression test for bug 118835133" into oreo-cts-dev am: 0f8b60c5d5 -s ours
am: ab7c1d47dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ifecdaa5a8be998e0c52427b140112e6295244304