Merge "Avoid relying on undocumented behaviour in popup test." into marshmallow-cts-dev
am: d5b75ce7c4

Change-Id: I70122d89eb431dc743071afb422bcad6d5550174