[automerger skipped] CTS-on-gsi test, CtsSecurityHostTestCases--android.security.cts.ProcessMustUseSeccompTest#testMediaextractorHasSeccompFilter --android.security.cts.ProcessMustUseSeccompTest#testOmxHalHasSeccompFilter failed am: 82f153c157  -s ours
am: 21a00f8edb  -s ours

Change-Id: I4ebee10100194e599c51feb4ce394d34e2bc9191