Merge "DO NOT MERGE: Remove testAddTwoToastsViaAddingWindowApisWhenUidFocusedQuickly." into nougat-mr1-cts-dev am: da7b28a30b  -s ours am: 1f9873d562
am: 6e157d1408

Change-Id: I9a92352e574edce3390e5819a3ff2a3f1b58e70c