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

Change-Id: I80967770116f0ca1c5f43b010bfe8bca2963192c