Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: 1f3e40e8e7 am: f0b712654a

Change-Id: I278da0f396b3e422e9b859fca52a50c2550d4e76