Merge changes from topics "consistent-frame-number-type",...

Merge changes from topics "consistent-frame-number-type", "metrics-callback-surface-id", "remove-asc-from-fmcallback"

* changes:
  Get rid of unused ASurfaceControl in frame metrics callback
  Update ANativeWindow_getNextFrameId docs to specify API contract
  Make frame number type consistent
  Update type of surface stats listener function to include id used to identify the surface