Merge "deviceprofileowner: AssistScreenCaptureDsiabledTest fix" into oreo-mr1-cts-dev
am: 099c7ba80d

Change-Id: I465a0520dd1cb7259a053135770a36c423182d04