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

Change-Id: I473366d13e5912a6284e97feaa5f77a9188615a1