Merge "SurfaceFlinger: allow confing change in AoD"