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

Change-Id: Id487f556acb55ac1269171aefa287d993330b42a