Merge "Merge "Let the first frame come in before measuring refresh rate time." into nougat-mr1-cts-dev am: 1ed6def8b7 am: 8c1ab9cd97 am: a463b74328 am: 46affcd80c am: 336f5f028b am: 13160f0ab1" into oc-dr1-dev-plus-aosp