Merge "SurfaceFlinger: set refresh rate type when after an attempt to switch" into qt-r1-dev am: df68bf4fa3
am: 5455c612a5

Change-Id: Ida935ecfbca8928089904a1437b73ce771ac033f