Merge "SurfaceFlinger: remove rounded corner from Refresh Rate Overlay" into qt-dev am: f96a67700e
am: 33dfb400ac

Change-Id: Ia53c812bf6ffa100c25a576207aaa5e9d1388ffe