Merge "DO NOT MERGE: Test for bug 33137046" into nougat-cts-dev