Merge "Merge "Revert "hwui: ro.hwui.render_ahead=0 queue on high FPS"" into qt-dev am: 515e7a7464 am: ba97992191" into qt-r1-dev-plus-aosp
am: 03599fd1fe

Change-Id: I336f309117835b5e058b329d99786b2e47a172c3