Merge "Mark DisplayManagerServiceTest#testDisplayedContentSampling as FlakyTest"