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