Merge "SurfaceFlinger: Add TrustedPresentationListener API"