[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 am: 95131f0ff1

Change-Id: I3304c315f3e8d6038cd3d58736c59924841124b3