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