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

Change-Id: Id0ee939b0724d79f7a518d020eaa5759aed44aca