Merge "Merge "CTS: Lock AssistantActivity orientation to prevent relaunch" into oreo-cts-dev am: 2d302bab62" into oreo-mr1-cts-dev am: 3c573cc546
am: 768bbf530f

Change-Id: I637a3f2d738ca161ed3dbfc8235bc3359060fe72