[automerger] Merge "Merge "Avoid relying on undocumented behaviour in popup test." into marshmallow-cts-dev am: d5b75ce7c4" into nougat-cts-dev am: 482aa6a49d am: 9946ac1b02 am: ff575db385

Change-Id: I9381ace0353071416ae23ba44e21b8b89b6a655e