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

Change-Id: Ib9142845c6957cf4daa7fce1e232af1676aaf86e