[automerger] 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 am: 00beaf2426 am: 3ab5e5b4fb am: 1bcbf0027d

Change-Id: I4548b4cda3dabe1d951fc52da2cfc1e91fc5e5c0