Merge "SurfaceFlinger: Select which layer state to visit" into oc-dev
am: 3e0a85b997

Change-Id: Id34c10e20a9583efd67062b5d650c150002bce31