Merge "Merge "DO NOT MERGE: Test for bug 33137046" into marshmallow-cts-dev am: c66c5aba39  -s ours" into nougat-cts-dev
am: 27fe7888c1  -s ours

Change-Id: If28d937e329443e2326fd96011502ca97ad9e36c