Merge "DO NOT MERGE: [BugFix]android.server.cts.ActivityManagerAmProfileTests#testAmStartStartProfilerNoSamplingNoStreaming" into oreo-mr1-cts-dev