SurfaceFlinger: fix setDesiredActiveConfig am: 59db0a38cc am: 50b32e72b9 am: 03b37b7944 am: 9a26da0b5d

Change-Id: Ibc6915cb6a7122e21aa5bedf95a4bf0d8dde4d86