Merge "Merge "O Backport: Add a regression test for bug 118835133" into oreo-mr1-cts-dev am: f09ed7d9f6" into pie-cts-dev