Merge "Merge "Enhance compatibility for dismissing MediaProjection permissions" into nougat-mr1-cts-dev am: 21709726d3" into oreo-cts-dev am: d2341ab208 am: 5b85b29ff4 am: ee37c4b25b
am: fa13aadbad

Change-Id: Icf793f9563f0cbb4234810f5653754e95be44894