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

Merge "Merge "[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: d0277f83 -s ours
am: 5e84594d -s ours
am skip reason: change_id I7bceaf28c60ea9658a0b1ebee66f2050f219bbd0 with SHA1 abf4b638 is in history

Change-Id: I195c414401acf88e425b15e85b7f06643353bd76