[automerger skipped] Merge "DO NOT MERGE: [BugFix]android.server.cts.ActivityManagerAmProfileTests#testAmStartStartProfilerNoSamplingNoStreaming" into oreo-mr1-cts-dev
am: 86a95e7d4b  -s ours

Change-Id: I8ab54253706ebd0ebbb213691fdccfa2c018eae1