[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in...

[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a0 -s ours am: 0cd1fdd6
am: 489edfda

Change-Id: Iee819080ed09d2136c0f7467be770e0e5a36437f