Merge "N Backport: Add a regression test for bug 118835133" into nougat-cts-dev