Add a test for public bugs 2111 and 2136.

Bug: 22602137
Bug: 22104401
Change-Id: I5c994de53b5906416767a8a1abe38fe59afb7cc0
1 file changed