Merge "Revert "SurfaceFlinger: debug layer bounds inset"" into android10-gsi