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

Change-Id: I22608179d589cdc5785c74cbda61305594fe2adb