[automerger skipped] Merge "N Backport: Add a regression test for bug...
[automerger skipped] Merge "N Backport: Add a regression test for bug 118835133" into nougat-cts-dev
am: f54c73ce -s ours
am skip reason: SHA1 f54c73ce skipped by user nfuller
Change-Id: I572b60905fd2da1eb14de03f58919bf2eb6358dd