Merge "Merge "[automerger skipped] Merge "Wait for each orientation request in ApplicationTest" into nougat-mr1-cts-dev am: d1753e828e  -s ours" into oreo-cts-dev am: 6c306ed88f" into oreo-mr1-cts-dev