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

Change-Id: Ia3f4515efa1102786cbd9398121a0912e530ae91