SurfaceFlinger: fix setDesiredActiveConfig am: 59db0a38cc am: 50b32e72b9

Change-Id: Id2c249c94c0dee8f9e328b34fb6839b95dc0f395