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