Merge changes from topic "layerid-in-wm-trace"

* changes:
  Dump WindowContainer SurfaceControls to proto
  Dump SurfaceControl's layerId to proto
  Expose SurfaceControl's native mLayerId property to Java