[automerger skipped] SurfaceFlinger: lock mStateLock when modifying allowed configs am: abf9106001
am: 6d6cfa493a -s ours
am skip reason: change_id I569e75968aea676c96fbc648140ac49a165ffb69 with SHA1 a3129fbfc3 is in history

Change-Id: I7ab57783a4c9d37ca7adf8230b79de4b7616f06a