am a02e9484: Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev

* commit 'a02e9484be6894f8a4db7049d432f534a4e0a676':
  SurfaceFlinger: Prevent deadlock by updating an atomic layer set.