Merge "[automerger skipped] Merge "Merge "N Backport: Add a regression test for bug 118835133" into nougat-cts-dev am: f54c73ceb4" into nougat-mr1-cts-dev am: 7b7f7eb47b -s ours
am: d0277f831f -s ours
am skip reason: change_id I7bceaf28c60ea9658a0b1ebee66f2050f219bbd0 with SHA1 abf4b6381b is in history

Change-Id: Ib20d12e8df194bb73f9da9ffd799a5dd7d1f237c