[automerger skipped] Merge "Merge "N Backport: Add a regression test for bug...

[automerger skipped] Merge "Merge "N Backport: Add a regression test for bug 118835133" into nougat-cts-dev am: f54c73ce" into nougat-mr1-cts-dev am: 7b7f7eb4 -s ours am skip reason: SHA1 7b7f7eb4 skipped by user nfuller skipped: 0f2a8afe skipped: 36414a06

Change-Id: Id44c52ad36b2eddd225f443075e54fc81c2e0923