[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 skipped: bd8c4429 skipped: 4ef316c4
Change-Id: I3018fda91160ae62a84b7f5b97008c54098d63fb