Merge "Add unit test on sending power hints in SurfaceFlinger" into tm-dev