[automerger skipped] [SurfaceFlinger] Plumb getPerFrameMetadataKeys and setLayerPerFrameMetadata. am: 2c327ac284
am: 773e2f2327  -s ours

Change-Id: I1504ed926b8633b87a4be86f7b1652d610223d6e