Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: e03e9dd1aa am: 82072cf28e

Change-Id: I26c37a46ade0015982b0a10cfeef7c60fa8f0216