Merge "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 am: 6e09d73732" into pie-cts-dev
am: 9617c3c143

Change-Id: Ibb9a4e7908f3327b385a1c454ff26fff510cfa57