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