Merge "Merge "DO NOT MERGE: Test for bug 33137046" into lollipop-mr1-cts-dev am: fb43b21e52  -s ours" into marshmallow-cts-dev